From: Florian Müllner <fmuellner@gnome.org>
Date: Mon, 10 Oct 2011 17:21:18 +0000 (+0200)
Subject: layoutManager: Ignore 1px overlap in _isAboveOrBelowPrimary()
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~7469
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1a8d78212fcdcda185c93d4fe45324b560da9de3;p=gnome-shell.git

layoutManager: Ignore 1px overlap in _isAboveOrBelowPrimary()

Nvidia's twin view option does not align monitors properly, but with
a one pixel overlap. It looks safe to ignore an overlap this small
to make this case work.

https://bugzilla.gnome.org/show_bug.cgi?id=661387
---

diff --git a/js/ui/layout.js b/js/ui/layout.js
index aad4bbbd6..04e8e4ab5 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -216,10 +216,10 @@ LayoutManager.prototype = {
         let monitorLeft = monitor.x, monitorRight = monitor.x + monitor.width;
         let primaryLeft = primary.x, primaryRight = primary.x + primary.width;
 
-        if ((monitorLeft >= primaryLeft && monitorLeft <= primaryRight) ||
-            (monitorRight >= primaryLeft && monitorRight <= primaryRight) ||
-            (primaryLeft >= monitorLeft && primaryLeft <= monitorRight) ||
-            (primaryRight >= monitorLeft && primaryRight <= monitorRight))
+        if ((monitorLeft >= primaryLeft && monitorLeft < primaryRight) ||
+            (monitorRight > primaryLeft && monitorRight <= primaryRight) ||
+            (primaryLeft >= monitorLeft && primaryLeft < monitorRight) ||
+            (primaryRight > monitorLeft && primaryRight <= monitorRight))
             return true;
 
         return false;